some minor perofmance increase for OnUpdate