Integrated aman's changes