a lot of change which  is made  in the branch of eflake

eflake branch change