Changed it some more to meet xofts recommended way.