Added some adjustments to remove confliction.