Changes according to @thecodejunkie