added shortener
finished