Updated to phase 7