Added a couple tweaks to past efforts.