Modified for testing design