almost finish supporting anon app usage