Uncommented some things