Added framework for second pass