Updated some stuff again