Changes as per meeting on 3/13