Updated with owfMagic update