Redoing some of the logic to keep anon ticky