updates
bfore merge
renaming to laff_env