more edits to hopefully speed up building