Not finished implementation of task25 (2)