Solution to #2 is added