Added funky and got rid of some other stuff