Made some ...adjustments