redoing ts shit give me a moment