Enhancing The Market Surveillance