Testing attacking
minor refactorings