optimize
refactor name a bit
increase version
minor refactoring