Uncommented some functions