modified to allow for local testing....