integrated lehmannro's edits