in course of updating...
very minor stuff
merge