Made mod more conventional