changed way to auth and some localized