Improve timings of open/close