Implemented 2., see previous comment for 1.