Random code changes
Better metric handling