Hongyi add changes to Problem