refactored with coach Stephen