Few final changes before i start