Temp changes to get it working with logging