@cbokhove tweaks based on external factors