Adding new functionality
new version!!!