Follow requirements (8/23)

Follow requirements