uncommented some good code