Updated to match indigo-devel