Test and code optimsation
.