Up to #4

correct so far