conforming changes