handle player units better