Updated for IPL7