Fixed so it can run on AWS Servers