fixed main now