updateed 26 for finishing up