1. Final improvements