temporary commit; Nirmal's commit should trump
Fixing duo play