My pull request - paolo

Lots of shenanigans

here,