updated to support compass and susy