Removed timeout because it was annoying