Updated make system