Updates for Croogo 2.0