Redone some stuff