Updated with owfMagic updates