Changed more design