online version, some improovements