Further progress
Improvements