Working version w.r.t. commands