Updated to recent v7