Improvements
Bug fixed