changed class names and formatr