Updated methods so it actually compiles