New version that works on zodiac