Code modified
Changes merged