added controls and tracking