Reworked retrieval for multiplayer
Merge branch 'iss88'
Merge branch 'master' into DesignTeam