Commented some functions