Updated per comments from claudep