update from latest gelam