last touches for this major overhaul