Updated with new cleaned up build method