Feature/susy2