Modified to the develop branch... by zmh