Updated to new basestring -> str