Changes for @thecodejunkie