Fixing up my parts