Full change of the code. Pair programming with Matt