Updated to include more phase4 functionality