Adding new stuff to make setup work