rchanges as per aws support instruction