design changes
merging conflicts