added more magic