1st part of bypass implementation