Adding our additions and modifications