more fiddling

not sure if changes are correct