new layout for rev2