Cleaned up and fixed round based cycling