better experience structure
fixed potential NPEs