Rev of draft program, including row types