add new changes to prepare env