Renamed and implemented more intelligent player