Added updated version of short code