added alignment (possibly buggy?)