Taking care of Issue 2 and Issue 3