adding some pinks, changing function name, changing which-func