reworked design, controls