heikki's comments added, but not integrated yet