Made more design changes