more changes for gravMap build