Tested untimed version, added full timer