change order of mark_as_received