Added proper forex finding