Modifications to sampler timing and start note
Merge conflict fixed