Comment and change timeout