Added map back in