add changes to ning's branch
more change to branch