Additional design changes