edited ling on master