Further modifications to match initial design.