Added some more A+ guy stuff