Added phase 2 functionality