After a long struggle I think I got it right to fix the N1 Bypass.
Hopefully by the next update it will be in.