added my some more magic