changed some design things