Adding shim, adding logout, adding notice