diff --git a/opensym2017/content/12-conclusion.tex b/opensym2017/content/12-conclusion.tex
index cf45e00..71b0655 100644
--- a/opensym2017/content/12-conclusion.tex
+++ b/opensym2017/content/12-conclusion.tex
@@ -4,35 +4,57 @@
 In this paper we presented and discussed issues experienced during a government-funded 
 project, in partnership with the University of Brasilia and the University of
 São Paulo, to evolve the Brazilian Public Software Portal. 
-
-The contributions of this paper are twofold. First, we presented how an unprecedented
-platform was developed and delivered to the Brazilian government. This 
-platform - developed by a heterogeneous team of professors, masters and 
-undergraduate  students, IT professionals, and governmental managers - provides 
-several modern features for the integration of more than 10 FLOSS systems.
-
-Second, the experience in the SPB Portal project pointed 
-out that it is possible to mitigate conflicts in the development environment
-and to conciliate governmental and academy cultures. The team was engaged in
-providing a friendly working environment as well as in showing to governmental agents
-another way to interact with the FLOSS community and the university. In the paper,
-we tried to show that, as long as the institution can provide a healthy and challenging
-environment to its students, one may conciliate studies and professional training
-in universities. After the end of the project, some students successfully
+Its contributions are twofold. First, we present the strategy used to develop
+and to deliver an unprecedented platform to Brazilian government. Second,
+based on the results of the SPB Portal project, we point out that it is
+possible to mitigate conflicts experienced in the development environment
+and to conciliate governmental and academy cultures. 
+
+The SPB portal integrates more than 10 FOSS tools and provides several features,
+such as social network, mailing list, version control, content management and
+source code quality monitoring. Concerned with the platform susteinability and
+maintainabilty, the aforementioned 10 FOSS tools were integrated with minimum
+differences from their official versions and the new developed features were
+sent upstream to ensure an alignment between the portal systems and their
+respective official versions. In the integration process, the main softwares
+were identified, specific teams were formed to work with each one of them
+and each team was composed of students with different levels of skills and at
+least one senior professional.
+
+In terms of mitigating conflicts, we tried to show that, as long as the
+institution can provide a healthy and challenging environment to its students,
+one may conciliate studies and professional training in universities.
+In our work process, based on open and collaborative software development
+practices, students could negotiate their work schedule as well as count on IT
+professionals to solve development issues.
+Among the students, we have defined coachs for each team and a meta-coach
+(coach of whole project). All coaches, together with professors, have
+intermediated the comunication between client (Ministry of Planning of Brasil)
+and the rest of the group. 
+After the end of the project, some students successfully
 embraced opportunities in public and private sectors, within national borders
 and abroad. Some other students went further and started their own companies.
+
 We also demonstrate that, with some adaptations/"translation processes", it is feasible
-to conciliate agile methodologies and FOSS practices in order to develop software to 
+to conciliate agile methodologies and FOSS practices to develop software to 
 governmental organizations with functional hierarchical structures that use 
 traditional development paradigm.
+Aiming at reducing client questions about workconclusion, a DevOps front was
+created to automate all deploy process and also  to work in continuous
+delivery. The government was brought to our work environment and interacted
+with our management and comunication tools. For the project success, we
+focused on providing a friendly working environment as well as on showing to
+governmental agents another way to interact with the FLOSS community and the
+university. 
 
 \leo{Padronziar uso FOSS vs FLOSS. Qual vcs preferem?}
 
 Future work should use data produced by the project to validate and evaluate
-how the used FLOSS and Agile practices have impacted the students and also the
+how the used FOSS and Agile practices have impacted the students and the
 governmental development process. For this, we would conduce a \textit{postmortem}
 analysis using the project open data and a survey targeting the involved actors.
 
+\textbf{Final remarks}
 
 The portal is available at \url{softwarepublico.gov.br}. All
 documentation, including detailed architecture and operation manuals are
@@ -44,7 +66,7 @@ in open repositories, available on the SPB Portal itself. We also
 contributed these features back to the respective communities, which
 benefits both those communities and us, since we can share future
 development and maintenance effort with other organizations that
-participate in these projects.
+participate in these projects. 
 
 %===========
 % Conclusion
--
libgit2 0.21.2