added 24 & 25, edit 22