Commented out timeout feature