Final Edit for 20140611 version