ehab's changes