Adding Rake to the mix...