Minor changes; func