Some changes were made here