back to only server and map. correctly now