changed to class
updated version