new generic refactorer- pre manual tree annotation