New updates, but with conflicts

Created by: dennorske

Hello!

I PR my updates to you, as I see you've been using it.

There are some changes that conflicts, as you use some env vars.

Feel free to reject or manually merge how you wish.

den