removed other sadi stuff