updated for Z30 inputs for issue #1018