some changes not commited after Budapest