updated to work with 3.4.x CLI