More design modifications