Updated prototype, ready for testing