added some spaz logic