refactor all, sf 2.6.1