Added other exchanges, but still not working correctly