SART works, refactoring
merge sart-stable