Start of into rewritten to improve flow of arugmentation - Mario