Updated to RFC standard