major update before merging with mariarosaria
major update before merging with mariarosaria - new files