Changed. Also changed class name.