[t3041] Update source directly after updating start and end so that the source works
[t3041] Use popcornOptions to update