initial code edits