Changes for croogo 2.0