Wait without pid and more logging