Some changes made here and there