Rewrite more parts
Rewrite section on build