final update

final update by kingwjz