* add spot & on demand code