Got rid of timeout