initial changes to get BAKED