Latest update, with more magic.