design changes
merging changes from gish