final commit. End of the first part of task.