Added new functionality, improved old features