comment update, too lazy to copmlete TODO