Added restart method, removed features/