Changed to flex in next ver