Add functions, remove comment