Revision before pass off

Going to do a few last minute testing, revert back if changes are too
many before pass off