Moved for ease of merging