remove comment out on some functions