Switched order of parts and added some new links