Changes added for final testing