Major revision basically done