authentication removed to just one spot instead of many
authentication removed to just one spot again