added stop signal, adjusted for roll to prevent false triggers