CEXT - 559 # work throught localStorage