Added the ability to bypass custom functionality