Mid-way of minor rewrite