a few modifications before completion