dammit order was not as i expected
scripted update of code from master at 4ab2044 dammit order was not as i expected