more steps towards new API.