Re doing the changes I removed trying to fix AWS