JT's latest changes