Improving the 'when' questions