Should work much cleaner now