better spacing and limit