We have an existing Martingale EA as attached. Please see below required correction, modification and addition of this EA as stated below points

A.	Correction
	1.	First TP was not consistent on 6pips or doesn’t follow on what was indicated in the input settings. (Note: back test was okay but when it was in demo account, the first TP was not consistent)

B.	Modification
	1.	Moving Average should have enable/disable in the input settings. (If disabled, then both buy and sell will open simultaneously (hedging)).
	2.	Current RSI: If Oversold – Stop trading of Sell. If Overbought – Stop trading of buy CHANGE to below details:
		Modification: (Note: Only will execute trades if Oversold or Overbought base on the extern integer settings)
		a.	If Oversold and there is no open buy trade, it will immediately open a buy order. If the market continues in Oversold state, then buy will martingale.
		b.	If Overbought and there is no open sell trade, it will immediately open a sell order. If the market continues in Overbought state, then sell will martingale.

C.	Additional

1.	Numbers of buy and sell trades should be reflected in the MT4 App.
2.	Display on chart screen the following settings: Take_Profit, Lot Size, MA Enable/Disable, 2nd Trade Distance and AggresiveMarti.
3.	2nd trade will open base on distance (Note: the distance should be included in the extern integer in pips) and have also enable/disable settings. 
	a.	Note1: if incase that the distance was not able to meet before 4 hours, normal time of trade should be followed. (please refer to C.1.)
	b.	Note2: This logic will only be applied base on Moving Average trend settings above. Meaning:
		i.	If uptrend, this will only be applied on Buy trades;
		ii.	If downtrend, this will only be applied on Sell trades;
		iii.	If Moving average is disabled, then this logic will be applied on both buy and sell.
4.	After 5th trade, next trades will open on every Support (if 5 buys) and Resistance (if 5 sells) price only based on FIBONACCI PIVOT POINTS FORMULA (Default Time Frame: W1). Please refer to below formula and directions on EA.
		R3 = PP + ((High - Low) x 1.000)
		R2 = PP + ((High - Low) x 0.618)
		R1 = PP + ((High - Low) x 0.382)
		PP = (H + L + C) / 3
		S1 = PP - ((High - Low) x 0.382)
		S2 = PP - ((High - Low) x 0.618)
		S3 = PP - ((High - Low) x 1.000)

	W1	 	W2
 	Fibonacci	Fibonacci
R4	 	 	R4	 
R3	1.15447	 	R3	1.14268
R2	1.14629	 	R2	1.13703
R1	1.14123	 	R1	1.13353
PP	1.13305	 	PP	1.12787
S1	1.12487	 	S1	1.12222
S2	1.11981	 	S2	1.11872
S3	1.11163	 	S3	1.11306
S4	 	 	S4	 
	a.	Note 1: This algorithm should still follow the current EA restrictions (1. The EA will not trade if the last trade is already running profit and 2. If the last trade is within 50 pipsteps points / 5pips on the current market price).
		i.	Scenario base on above #1 (have 5 buys). If for example, that on Week 1 (W1), S1, S2 & S3 was already traded, then S1, S2 & S3 on Week 2 (W2) will not trade and will wait for the next set of pivot points since those prices are above 1.11163 (S3-W2) meaning it is already running in profit at those W2-Support prices.
		

	W1	 	W2
 	Fibonacci	Fibonacci
R4	 	 	R4	 
R3	1.15447	 	R3	1.14268
R2	1.14629	 	R2	1.13703
R1	1.14123	 	R1	1.13353
PP	1.13305	 	PP	1.12787
S1	1.12487	 	S1	1.11123
S2	1.11981	 	S2	1.10773
S3	1.11163	 	S3	1.10267
S4	 	 	S4	

		ii.	Scenario base on above #2 (have 5 buys). W2-S1, 1.11123 will not trade since W1-S3, 1.11163 is within 50 pipsteps points. Instead, it will look to the next support price (S2) before it trades.



	b.	Note 2: Max trade shall still be applied.
	c.	Note 3: If incase that all 3 pivot point prices were traded (either Support or Resistance), the EA will temporarily stop trading for the week until the next set of pivot points.
	d.	Note 4: If incase that last trade was 5th trade and it was manually close, then pivot point system will not apply. The EA should always count first the number of trades and the Pivot point system will only be activated if 5th trade was not close. 
	e.	Note 5: If incase that the last trade is either from 6th - 11th trade and it was manually close, then the basis of the system should still be the price of the last trade even if it was closed manually.
		i.	Example: if the last trade is 7th trade and was cut manually, the basis of the pivot system will still be the price of the 7th trade and so on.
		ii.	If 11th trade was close manually, then the system should trade again and the basis of the pivot system will be the price of the previous 11th trade