merge jonathanstark's edits