Made TAKE more "secure"/closely follow spec