More of Dan's changes