Integrated ashkans changes