* added lots of stuff