Messed with the design again