Arranged rmmap - Now working correctly