made a few small changes, removed age categories, replaced with vector