change the mapping to use short hand and also  made the mapping logic a little losser