Worked a little to make it compile a little more