++ Added Jorge's changes.