testing end fixes