Added alignment stuff