Modifications on AWS