adding more conditions using the new mapy function, removing the duplicated conditions