herp derp

changes from Greg