updated for 2013 and running on EC2