wait button enhanced #19