changing class to remove conflict