Works for more lengths now.