updated w/ new additions