fixed JT's stuff