Modifications for Hazel project