Fixup! Added rake and expanded a group