changed class to avoid conflicts