Second pass setup

Second pass setup