Can we get rid of the setTimeout ?