Updates to the bolierplate