multiple changes, still working on things