Cakefile changed to use a more imrpoved version