Bug fixed and new functionality was added