Tons of changes for ruyb2.0 support ...