added class 24
more for 24
finished up 24