Updated to use zoop