Align working (hopefully)