Did some changes

Design changes.