saving latest changes from MASSIVE rework