changed some stuff up