add partial support for non-scheduling shots