partial solution for 2.2.4