Second commit after timurn review