#3 & #6 should be fine now