Improved onthefly-updates