Towards version 2