[@Ambra] Edited the CS as instructed, is it good to go?