Still having some problems replacing noir session handling