-- added some more crap