updated with stuff for 24th