Less magic, more clear