added timing signal and slot
Fix merge conflicts