20141007 change logic to stage