added amazon support