Added some magic ^_^