stress, new features & refactoring