Added Jay's stuff