update from rockweb core