Better magic collecting