added lots of stuff!!!!!!