Redid Mapcar because of failed push