Improving setting step