Before Merging to final