moved some stuff to dash