Fixes the map and almost complete read method