made some updates in main