Updating
Performance fix