Updates to conform to Lawyerist