Updated based on testing w/ AWS