Added requirement 5 - Yue