Second draft for the TripleO part