additional edits to James’ code