Updated make process