Updated to spec