removed chaco if statemente