Minor adjustments. Testing