Simplified Player a little.