Ready for testing version for Calvin