changes; make compatible with klothe