Cfy 1419 update

Good suggestion. I'll move it to another file and move outputs to the bottom.

I agree it's strange, but you added it :)