Added new msg finder and 2 modes