Updated per comments