Add option to just do alignment