Fixed copy paste bug, upgraded version