lotta changes
fixing conflicts