Changes with archive
Merge Fixed