feat/preview - merging Celines' changes in