first cli overhaul