modification in dev 1