Added faster time detection