refactoring with last projects using stormbringer