improved first message and timeout