cleaned up all logging and shifting