Added Daniel's changes