minor design and remarks