Alexandru's modifications