rposborne's changes