Added option to pass w_range and increased eta for all cases