Updated to use proper shorten