Changed the build order