changes to support logging