Update RBTY still some bugs