updated to latest version of Rock (almost beta)