reverting to Amr changes