Added map info back in.