Modifications for testing