Made Some Small Optimis Changes