Removed dupliate methods in Controller caused by merge
Fixed autorunning/pausing/resuming issues