NIL and Portal changes