made changes and stuff