database modifications according to tasks #245612/3