Improved the building process