Simplified per Rachel's edits