List fixes
SR refactoring