Added Pass2 Functionality