This update implements following improvements.