Changes for doing less work EC2