Jenny, Jeremy, Peter | Further refactor version 9