additions/edits by Philip