Continue with timotimo++ 's work