merge charles changes back in