Improvements (#8)