Modify main (#32)