Add link protection and reformat *should* work