Changes for rev1
Fix merge problems