progress with rewriting clean20131204