Fixed measure map fn + removed redundant entries