Finished integrating new Pass Handling