Updated per Yvette specifications.