Functions file fix