Updates from testing