initial
several changes