started adding support for players
fixed merge conflict