Update and rename flatten to p07