Changes to stop adding Extra end