several changes en additions