Changed some stuff up for the better