Changed from static to instance