adjusted stuff to work on aws