Adding back in AWS connection