deleted more stuff to make it smaller