Final improvements