Redid input and added controls