Updates from initial testing