Gideon : Merged changes from Matt