The re-done and improved version