All changes re-done