moved more stuff to local