Added new functionality. Testing needed