Upgrade to rev1

Work in progress