big changes in slave...
almost done