Add delay, remove 'main()'
Merge conflict