Switched to pointers for methods