More changes working on it