Added onthefly-updates