finish integration of nosurf