added some new edits. Still not Tested