about to add eugene's refactored updates