Updated sim and refactored player