changed some design