more rake task redesigns