OK, more changes, will it pass finally?