Need to be fixed as in pics