Aram & Mattia - some refactoring