Updating rect instead of creating new ones
Fixing conflicts