Changed to AWS & added dotenv