added lots of pin stuff