Changes methods to instance instead of static