Some changes in Default Controller