Updating to latest from "scratch work" repository