Worked alot on editing