added uncommitted norm_engine changes