sync up on working code