Added a Gig type and modified the build order