add option to change return value