Customer's tweaks