added Connor's awesome things