tweaks to #2 and adding #3