Do Edits and still trying to improve