clean and renaming
add part grid