Added time robustness