Boom de yada

Almost done fixing.