Joe rewritting

Joe rewritting