changes and adding new features
fix