Some updates in main