Add a little extra magic?