stuff added
Fixing merge conflicts