some design update