Reverted location changes
readded the logging commit