The figure liquid include refactored