#853: design changes added.