removed all before adding back new stuf