More design changes, getting there!