removed legacy
corrected moved entity updating