Alignment model
Fixes