Final updates before vacation :)