Dev/gabriele colantoni/modification style