Updated Rake (again)