changed short vs long algorithm...