Some changes to make sure it's taken in accocunt