Edits

For Integration purposes. Improvements to be made