huge update
replace login with env variables