Some defs added
Alignment done!