Dev2

@lauraluiz please review.