moving export to after; adding env