Nov 30, ec2 setup, logic fix