Minor implementation change for functions