IMHO, this structure looks much more straightforward than before...