Made changes, still working