first changes for gravMap build