Modified for testing