Re-incorporating MP's changes...