first pass on 1.4.7