One limit

This is a up to date rebase of #684, it addresses issue #557.