moved equipment stuff to equipment