Updated to make sense for Indigo version