Finalized changes with amazon server