Some changes based on Jay's latest input