All changes working