change to accomodate distributed env (breaks for now)