gutted some stuff