Reworked retrieval for multiplayer
Merge branch 'iss88'