Maybe less magic will work