Some first modifications