Finishing to fix reference loop