fix List changes
remove scoped
use array notation instead of NSM