still tweaking that authorization stuff; update for 6.1 final