improvements + new option