updates, need to fix data pulls