updates for dev rev 2