incremental work - preparing to roll back to previous style.