Terracing and adding keyholes later