Messed up a little with redundancy on #3