8cec464 small changes