Updated concepts to trim unnecessary steps