Changed to not use env variables