Changes based on Dave’s design.