Add a bit of time
Minor changes
Merge