some additions in main