Updated to the latest v7