SAParser fully updated

and working