extended and updated manual