core refactoring
inc version