improved version of Handbook