Misc Scenario Fix
start cleaning up and search for part name