improved and auto_align, now activated by default!