Changing back to non-class implementation.