updated as per new example and ToDo list