renamed and cleaned. ready