[#B1307] Changes based upon Geralds comments