cHANGED some stuff