reworked env variables