change way of checking Amazon client