Replaced some stuff