changed some stuff- tatyscode