Update #271 - Refactored code to be much nicer