some adjustments; to be continued