refactred base and new version released