Added functionality to peso
Fix conflicts