More progress
Fix