adding things slowly, something broke it before