fixed design issues with scheduler2 and apply