Temporary modified version for testing