Update from trunk, begin better Laziness