- now with dist and dev mode