Re-added design changes since my previous commit didn't work