Working on Remove Gaps