Refactored a little to tidy up.
Refactored a little to tidy up.
Merge branch 'nixta-working'