Ajusted setup