some modifications for testing