Modified for local testing