Quick re-write will finish tomorrow