alignment
merge Vittorios PR