cleaned up triggers partway