Sound + better handling of hazards