updated w/ new data and methods