my changes
merged nicks changes
added some small interactions