Added more magic