Forgot to delete a few lines when merging, fixed.