some changes and derp