more change to code