Final, minimal changes