trial changes: don't use them
trial changes seemed to work, pushing it finally with little changes in the log msgs