Variant - refactorization + aligment fixes