multiple changes. updating branch to most recent copy. changes in the design also