Added setup and diff&patch