Updates based on Jeffs suggestions