trying to merge

Trying to merge changes that were removed from previous commits.