Actually fixed all in i hope