Second part working completely