Updates to code for compitition