Including Jose comments and suggestions