removed existence check and commander dependency