update, need updates from eric still