Updated based upon feedback Omar