modified some design