#vd-1 style improvements