Updated to new method syntaxes