latest upm dev, incorporating rob's designs