added Start and Stop functionality