added class and added shortener