Updates based on testing