[@Shyri]

As approved by me, if you need confirmation. Results on some back and forths for the benefit of developing consistency as far as Feo/Shyri is concerned at least.