syncing some changes that break everything