Updated code to Zingy