Further core edits before development