Updated per review feedback