rather small
moved
many changes