[jh] Changes for AMAZON