release 2, greatly simplified