Updated system to match design changes