Improved the make process