revsing to first pass at design