Major key changes to allow for adaptability