Started adding manual control