Iterate a bit on an improved version of fb-sec