adding visuals
fixing conflicts