got comment partially work, need to modify