Merged sat changes, started on routing