2-8-13 added lots of stuff