Eh, changed some things