Some changes to main file