Hopefully less derp this time