changes for aws3