Done: Better security attempt - looks like it also includes better performance attempt branch...