Amazon Specific changes:
Added logs and corrected indentation according to 81161ebe668a14f87e1ef4b57f2d300a609b9a8b