Code updates for testing